Skip to content

feat: show unfinished cherry-picks and reverts before continuing Pi - #87

Merged
johnnyhuy merged 3 commits into
mainfrom
agent/issue-86-cherry-pick-revert-status
Nov 16, 2026
Merged

johnnyhuy merged 3 commits into
mainfrom
agent/issue-86-cherry-pick-revert-status

Conversation

@johnnyhuy

@johnnyhuy johnnyhuy commented Nov 16, 2026 •

Copy link
Copy Markdown
Contributor

Workspace status now shows an unfinished cherry-pick or revert before starting Pi and before continuing saved history. The notice remains after conflicts are staged and after a manual resolution commit when a multi-commit sequence still has work to apply.

Part of #1. Closes #86.

Inspection uses the selected worktree's Git directory, keeping linked worktrees independent and supporting nested roots. Merge and rebase notices retain precedence. Unreadable sequencer state produces an unavailable notice while file changes remain readable. The architecture documentation describes the added states.

Final verification on 28cc891 used Node 22.23.0 and Bun 1.3.14 through mise exec.

  • mise exec -- bun install --frozen-lockfile passed.
  • mise exec -- bun run lint passed.
  • mise exec -- bun run typecheck passed.
  • mise exec -- bun run test:unit passed, 114 tests across 10 files.
  • mise exec -- bun run test:integration passed, 114 tests across 14 files.
  • mise run build passed, including all gates and main, preload and renderer compilation.
  • mise exec -- bun run test:e2e passed locally, 72 tests across 8 files.
  • git diff --check passed.
$ mise exec -- bun run test:unit
 Test Files  10 passed (10)
      Tests  114 passed (114)

$ mise exec -- bun run test:integration
 Test Files  14 passed (14)
      Tests  114 passed (114)

$ mise exec -- bun run test:e2e
 Test Files  8 passed (8)
      Tests  72 passed (72)

The new Electron scenario, shows cherry-picks and reverts before new and saved continuation until abort, checks notices after staging all conflicts, focus refresh after abort, separate draft preservation, unchanged source history, no Pi execution, and desktop and native 900 by 600 layout bounds. A focused run passed all nine workspace-status Electron tests.

New logic and component cases include the following.

  • detects $operation with sequence=$sequence in a linked worktree through resolution and cleanup, covering single cherry-pick/revert abort and multi-commit continuation after a manual resolution commit.
  • keeps rebase precedence when it stops while applying a commit.
  • keeps changes readable when sequencer state cannot be read.
  • shows Cherry-pick in progress even after all root conflicts have been resolved and its revert counterpart, covering new-session, collapsed history and expanded history status.

The final hosted build gates passed. The final hosted Electron run, attempt 2 passed all 72 tests across 8 files on macOS.

$ mise run test:e2e  # hosted macOS, attempt 2
✓ shows cherry-picks and reverts before new and saved continuation until abort 4636ms
 Test Files  8 passed (8)
      Tests  72 passed (72)

Native screenshots from the first attempt on the final commit are uploaded in the pidex-e2e artefact. All nine workspace-status Electron tests passed in that run.

The ten added PNGs are under test-results/workspace-status/ in the artefact. Each operation has a desktop and minimum-window new-session capture, desktop and minimum-window collapsed history, and expanded minimum-window history.

  • workspace-cherry-pick-in-progress.png and workspace-revert-in-progress.png show the notices after all conflicts are staged.
  • workspace-cherry-pick-in-progress-narrow.png and workspace-revert-in-progress-narrow.png show the new-session view at 900 by 600.
  • history-cherry-pick-in-progress-narrow.png and history-revert-in-progress-narrow.png show the notice in collapsed history.
  • history-cherry-pick-in-progress-expanded-narrow.png and history-revert-in-progress-expanded-narrow.png show the guidance with transcript, draft and Resume available.

Local Playwright capture succeeded and wrote the same images to .tmp/proof/. Desktop cherry-pick/revert and minimum-window collapsed/expanded history were visually reviewed. The hosted artefact was downloaded and its desktop cherry-pick and expanded minimum-window revert captures were also visually reviewed. Inline image attachment was blocked by the unavailable browser host and Firefox native access returning cgWindowNotFound; the uploaded artefact supplies the PNGs. Scratch captures are not committed.

Validation exposed two existing test races, fixed in separate test commits. The long-session test now waits for the live fork rather than accepting the already visible history preview, and the history-export test removes a previous scratch download before waiting for the new one. Before those fixes, local runs had three long-session failures and then one stale-export failure; the final full local run passed all 72 tests. An earlier hosted run also hit an Electron setup execution-context failure. The first hosted attempt on the final commit passed 64 tests and skipped eight after another Electron setup execution-context failure in the tool-preview suite. Rerunning that failed job without code changes passed all 72 tests. The uploaded screenshot proof comes from the first attempt, where all nine workspace-status tests passed.

This slice reports operation state. Git operation actions and patch-application notices remain follow-ups. Inspection keeps the existing focus, navigation and 15-second refresh. Parent #1 remains open.

johnnyhuy and others added 3 commits November 16, 2026 22:34
Co-authored-by: OpenAI Codex <noreply@openai.com>
Co-authored-by: OpenAI Codex <noreply@openai.com>
Co-authored-by: OpenAI Codex <noreply@openai.com>
@johnnyhuy
johnnyhuy marked this pull request as ready for review November 16, 2026 11:50
@johnnyhuy
johnnyhuy merged commit 3e2ea9f into main Nov 16, 2026
15 of 16 checks passed
@johnnyhuy
johnnyhuy deleted the agent/issue-86-cherry-pick-revert-status branch November 16, 2026 11:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Show unfinished cherry-picks and reverts before continuing Pi

1 participant